From f021ee249201fa9b3f42f4f6802084e08184bb73 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 19 Mar 2005 19:46:17 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.87 (423c8189hXTe3A8DrAyRsqryeVoNxQ) Add MMC and Infoniband devices to XenLinux driver configuration options. Signed-off-by: Keir Fraser --- linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers | 2 ++ .../arch/xen/configs/xen0_defconfig | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers index 93db5f9df6..8158f26fd0 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers @@ -44,6 +44,8 @@ source "drivers/media/Kconfig" source "drivers/video/Kconfig" source "sound/Kconfig" source "drivers/usb/Kconfig" +source "drivers/mmc/Kconfig" +source "drivers/infiniband/Kconfig" endif if !XEN_PHYSDEV_ACCESS diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig index 2d1a431dcd..e906f98521 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.11-xen0 -# Sat Mar 12 21:28:56 2005 +# Sat Mar 19 19:42:39 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -816,7 +816,7 @@ CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m # CONFIG_AGP_EFFICEON is not set -CONFIG_DRM=y +CONFIG_DRM=m CONFIG_DRM_TDFX=m # CONFIG_DRM_GAMMA is not set CONFIG_DRM_R128=m @@ -889,6 +889,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # CONFIG_USB_GADGET is not set +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + # # File systems # -- 2.30.2